removed set_sort_column, as it was moved to the GtkTreeSortable interface.

Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
	moved to the GtkTreeSortable interface.

	* gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
	Make more efficient (fixes #50262).

diff --git a/ChangeLog b/ChangeLog
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 440b90df189a8148a9ccfe106819f0444605a607..2e52047f4c392de58ac49a5e3064e892c73c27be 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Apr  3 15:04:45 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.h:  removed set_sort_column, as it was
+       moved to the GtkTreeSortable interface.
+
+       * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach):
+       Make more efficient (fixes #50262).
+
 Tue Apr  3 13:55:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * NEWS: Updated.

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 04e27b845ad9fcacc856cc6d64c788ac4311e892..ef0518305c9c703a881eff3f52360b0f5999ac76 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -74,10 +74,6 @@ GtkTreePath  *gtk_tree_model_sort_convert_path   (GtkTreeModelSort  *tree_model_
                                                  GtkTreePath       *child_path);
 
 /* not implemented */
-void          gtk_tree_model_sort_set_sort_column (GtkTreeModelSort  *tree_model_sort,
-                                                   gint               sort_col);
-void          gtk_tree_model_sort_set_compare     (GtkTreeModelSort  *tree_model_sort,
-                                                   GValueCompareFunc  func);
 void          gtk_tree_model_sort_convert_iter    (GtkTreeModelSort  *tree_model_sort,
                                                    GtkTreeIter       *sort_iter,
                                                    GtkTreeIter       *child_iter);

diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 02629ebff38ad9324ab9f1efa4f708b4547ea0ef..4c511bb58b8649532f840cecd39d3efab3a9c419 100644 (file)
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -368,6 +368,13 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
       selection->tree_view->priv->tree->root == NULL)
     return;
 
+  if (selection->type == GTK_TREE_SELECTION_SINGLE)
+    {
+      if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+       (* func) (selection->tree_view->priv->model, &iter, data);
+      return;
+    }
+
   tree = selection->tree_view->priv->tree;
   node = selection->tree_view->priv->tree->root;